From 7f025f89f94af3afe615ed829aeeb0125f66b714 Mon Sep 17 00:00:00 2001
From: "Richard M. Stallman" <rms@gnu.org>
Date: Thu, 19 Sep 2002 01:03:43 +0000
Subject: [PATCH] *** empty log message ***

---
 lisp/ChangeLog | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ec9915ea74f..0d25dc3ea70 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2002-09-18  Richard M. Stallman  <rms@gnu.org>
+
+	* dired.el (dired-mark-pop-up): Doc fix.
+
+	* ediff-hook.el (ediff-cond-compile-for-xemacs-or-emacs): Put the
+	definition straight into loaddefs.el as well as executing it here.
+
 2002-09-18  Colin Walters  <walters@debian.org>
 
 	* calc/calc.el (calc-mode): Add font-lock-defontify to
-- 
2.30.2